From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 6 Mar 2016 04:41:10 +0000 (-0500)
Subject: spin button: Limit the entry width to reasonable values
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~2630
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=4ab91f09cf0b225d399bcc0d19df9fc91aabbe5c;p=gtk%2B3.0.git

spin button: Limit the entry width to reasonable values

When opening the value editor for any GtkAdjustment properties
in the inspector, the popover stretches out for miles, since
it reserves enough space to draw MAXDOUBLE. This is not useful.
Limit the space we reserve to 8 digits.
---

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index f24a98f56a..0219575501 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -1132,20 +1132,21 @@ gtk_spin_button_get_text_width (GtkSpinButton *spin_button)
   gint width, w;
   PangoLayout *layout;
   gchar *str;
+  gdouble value;
 
   layout = pango_layout_copy (gtk_entry_get_layout (GTK_ENTRY (spin_button)));
 
   /* Get max of MIN_SPIN_BUTTON_WIDTH, size of upper, size of lower */
   width = MIN_SPIN_BUTTON_WIDTH;
 
-  str = gtk_spin_button_format_for_value (spin_button,
-                                          gtk_adjustment_get_upper (priv->adjustment));
+  value = CLAMP (gtk_adjustment_get_upper (priv->adjustment), -1e7, 1e7);
+  str = gtk_spin_button_format_for_value (spin_button, value);
   w = measure_string_width (layout, str);
   width = MAX (width, w);
   g_free (str);
 
-  str = gtk_spin_button_format_for_value (spin_button,
-                                          gtk_adjustment_get_lower (priv->adjustment));
+  value = CLAMP (gtk_adjustment_get_lower (priv->adjustment), -1e7, 1e7);
+  str = gtk_spin_button_format_for_value (spin_button, value);
   w = measure_string_width (layout, str);
   width = MAX (width, w);
   g_free (str);